Hibernate SVN: r17892 - in core/trunk: annotations and 25 other directories.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2009-11-02 13:20:40 -0500 (Mon, 02 Nov 2009)
New Revision: 17892
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/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:
prep 3.5.0-Beta-2 by hand because maven rocks
Modified: core/trunk/annotations/pom.xml
===================================================================
--- core/trunk/annotations/pom.xml 2009-11-02 18:15:23 UTC (rev 17891)
+++ core/trunk/annotations/pom.xml 2009-11-02 18:20:40 UTC (rev 17892)
@@ -29,7 +29,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-Beta-2</version>
+ <version>3.5.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/cache-ehcache/pom.xml
===================================================================
--- core/trunk/cache-ehcache/pom.xml 2009-11-02 18:15:23 UTC (rev 17891)
+++ core/trunk/cache-ehcache/pom.xml 2009-11-02 18:20:40 UTC (rev 17892)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-Beta-2</version>
+ <version>3.5.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/cache-infinispan/pom.xml
===================================================================
--- core/trunk/cache-infinispan/pom.xml 2009-11-02 18:15:23 UTC (rev 17891)
+++ core/trunk/cache-infinispan/pom.xml 2009-11-02 18:20:40 UTC (rev 17892)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-Beta-2</version>
+ <version>3.5.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/cache-jbosscache/pom.xml
===================================================================
--- core/trunk/cache-jbosscache/pom.xml 2009-11-02 18:15:23 UTC (rev 17891)
+++ core/trunk/cache-jbosscache/pom.xml 2009-11-02 18:20:40 UTC (rev 17892)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-Beta-2</version>
+ <version>3.5.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/cache-oscache/pom.xml
===================================================================
--- core/trunk/cache-oscache/pom.xml 2009-11-02 18:15:23 UTC (rev 17891)
+++ core/trunk/cache-oscache/pom.xml 2009-11-02 18:20:40 UTC (rev 17892)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-Beta-2</version>
+ <version>3.5.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/cache-swarmcache/pom.xml
===================================================================
--- core/trunk/cache-swarmcache/pom.xml 2009-11-02 18:15:23 UTC (rev 17891)
+++ core/trunk/cache-swarmcache/pom.xml 2009-11-02 18:20:40 UTC (rev 17892)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-Beta-2</version>
+ <version>3.5.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/connection-c3p0/pom.xml
===================================================================
--- core/trunk/connection-c3p0/pom.xml 2009-11-02 18:15:23 UTC (rev 17891)
+++ core/trunk/connection-c3p0/pom.xml 2009-11-02 18:20:40 UTC (rev 17892)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-Beta-2</version>
+ <version>3.5.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/connection-proxool/pom.xml
===================================================================
--- core/trunk/connection-proxool/pom.xml 2009-11-02 18:15:23 UTC (rev 17891)
+++ core/trunk/connection-proxool/pom.xml 2009-11-02 18:20:40 UTC (rev 17892)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-Beta-2</version>
+ <version>3.5.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/core/pom.xml
===================================================================
--- core/trunk/core/pom.xml 2009-11-02 18:15:23 UTC (rev 17891)
+++ core/trunk/core/pom.xml 2009-11-02 18:20:40 UTC (rev 17892)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-Beta-2</version>
+ <version>3.5.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/distribution/pom.xml
===================================================================
--- core/trunk/distribution/pom.xml 2009-11-02 18:15:23 UTC (rev 17891)
+++ core/trunk/distribution/pom.xml 2009-11-02 18:20:40 UTC (rev 17892)
@@ -32,7 +32,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-Beta-2</version>
+ <version>3.5.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/documentation/envers/pom.xml
===================================================================
--- core/trunk/documentation/envers/pom.xml 2009-11-02 18:15:23 UTC (rev 17891)
+++ core/trunk/documentation/envers/pom.xml 2009-11-02 18:20:40 UTC (rev 17892)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-Beta-2</version>
+ <version>3.5.0-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/documentation/jbosscache2/pom.xml
===================================================================
--- core/trunk/documentation/jbosscache2/pom.xml 2009-11-02 18:15:23 UTC (rev 17891)
+++ core/trunk/documentation/jbosscache2/pom.xml 2009-11-02 18:20:40 UTC (rev 17892)
@@ -34,13 +34,12 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-Beta-2</version>
+ <version>3.5.0-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-jbc-manual</artifactId>
- <version>3.5.0-Beta-2</version>
<packaging>jdocbook</packaging>
<name>Hibernate/JBoss Cache 3 Reference Manual</name>
Modified: core/trunk/documentation/manual/pom.xml
===================================================================
--- core/trunk/documentation/manual/pom.xml 2009-11-02 18:15:23 UTC (rev 17891)
+++ core/trunk/documentation/manual/pom.xml 2009-11-02 18:20:40 UTC (rev 17892)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-Beta-2</version>
+ <version>3.5.0-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/documentation/pom.xml
===================================================================
--- core/trunk/documentation/pom.xml 2009-11-02 18:15:23 UTC (rev 17891)
+++ core/trunk/documentation/pom.xml 2009-11-02 18:20:40 UTC (rev 17892)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-Beta-2</version>
+ <version>3.5.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/entitymanager/pom.xml
===================================================================
--- core/trunk/entitymanager/pom.xml 2009-11-02 18:15:23 UTC (rev 17891)
+++ core/trunk/entitymanager/pom.xml 2009-11-02 18:20:40 UTC (rev 17892)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-Beta-2</version>
+ <version>3.5.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/envers/pom.xml
===================================================================
--- core/trunk/envers/pom.xml 2009-11-02 18:15:23 UTC (rev 17891)
+++ core/trunk/envers/pom.xml 2009-11-02 18:20:40 UTC (rev 17892)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-Beta-2</version>
+ <version>3.5.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/hibernate-maven-plugin/pom.xml
===================================================================
--- core/trunk/hibernate-maven-plugin/pom.xml 2009-11-02 18:15:23 UTC (rev 17891)
+++ core/trunk/hibernate-maven-plugin/pom.xml 2009-11-02 18:20:40 UTC (rev 17892)
@@ -27,7 +27,7 @@
<parent>
<artifactId>hibernate-parent</artifactId>
<groupId>org.hibernate</groupId>
- <version>3.5.0-Beta-2</version>
+ <version>3.5.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/jdbc3-testing/pom.xml
===================================================================
--- core/trunk/jdbc3-testing/pom.xml 2009-11-02 18:15:23 UTC (rev 17891)
+++ core/trunk/jdbc3-testing/pom.xml 2009-11-02 18:20:40 UTC (rev 17892)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-Beta-2</version>
+ <version>3.5.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/jdbc4-testing/pom.xml
===================================================================
--- core/trunk/jdbc4-testing/pom.xml 2009-11-02 18:15:23 UTC (rev 17891)
+++ core/trunk/jdbc4-testing/pom.xml 2009-11-02 18:20:40 UTC (rev 17892)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-Beta-2</version>
+ <version>3.5.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/jmx/pom.xml
===================================================================
--- core/trunk/jmx/pom.xml 2009-11-02 18:15:23 UTC (rev 17891)
+++ core/trunk/jmx/pom.xml 2009-11-02 18:20:40 UTC (rev 17892)
@@ -29,7 +29,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-Beta-2</version>
+ <version>3.5.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/parent/pom.xml
===================================================================
--- core/trunk/parent/pom.xml 2009-11-02 18:15:23 UTC (rev 17891)
+++ core/trunk/parent/pom.xml 2009-11-02 18:20:40 UTC (rev 17892)
@@ -29,7 +29,7 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
<packaging>pom</packaging>
- <version>3.5.0-Beta-2</version>
+ <version>3.5.0-SNAPSHOT</version>
<name>Hibernate Core Parent POM</name>
<description>The base POM for all Hibernate Core modules.</description>
@@ -54,9 +54,9 @@
</licenses>
<scm>
- <connection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.5.0-B...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.5.0-B...</developerConnection>
- <url>https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.5.0-Beta-2</url>
+ <connection>scm:svn:https://svn.jboss.org/repos/hibernate/core/trunk</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/trunk</developerConnection>
+ <url>https://svn.jboss.org/repos/hibernate/core/trunk</url>
</scm>
<ciManagement>
Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml 2009-11-02 18:15:23 UTC (rev 17891)
+++ core/trunk/pom.xml 2009-11-02 18:20:40 UTC (rev 17892)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-Beta-2</version>
+ <version>3.5.0-SNAPSHOT</version>
<relativePath>parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/testing/pom.xml
===================================================================
--- core/trunk/testing/pom.xml 2009-11-02 18:15:23 UTC (rev 17891)
+++ core/trunk/testing/pom.xml 2009-11-02 18:20:40 UTC (rev 17892)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-Beta-2</version>
+ <version>3.5.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/testsuite/pom.xml
===================================================================
--- core/trunk/testsuite/pom.xml 2009-11-02 18:15:23 UTC (rev 17891)
+++ core/trunk/testsuite/pom.xml 2009-11-02 18:20:40 UTC (rev 17892)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-Beta-2</version>
+ <version>3.5.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/tutorials/eg/pom.xml
===================================================================
--- core/trunk/tutorials/eg/pom.xml 2009-11-02 18:15:23 UTC (rev 17891)
+++ core/trunk/tutorials/eg/pom.xml 2009-11-02 18:20:40 UTC (rev 17892)
@@ -32,7 +32,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-tutorials</artifactId>
- <version>3.5.0-Beta-2</version>
+ <version>3.5.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: core/trunk/tutorials/pom.xml
===================================================================
--- core/trunk/tutorials/pom.xml 2009-11-02 18:15:23 UTC (rev 17891)
+++ core/trunk/tutorials/pom.xml 2009-11-02 18:20:40 UTC (rev 17892)
@@ -31,7 +31,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-Beta-2</version>
+ <version>3.5.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/tutorials/web/pom.xml
===================================================================
--- core/trunk/tutorials/web/pom.xml 2009-11-02 18:15:23 UTC (rev 17891)
+++ core/trunk/tutorials/web/pom.xml 2009-11-02 18:20:40 UTC (rev 17892)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-tutorials</artifactId>
- <version>3.5.0-Beta-2</version>
+ <version>3.5.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
15 years, 1 month
- 1
- 0
Hibernate SVN: r17891 - core/tags.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2009-11-02 13:15:23 -0500 (Mon, 02 Nov 2009)
New Revision: 17891
Added:
core/tags/hibernate-3.5.0-Beta-2/
Log:
prep 3.5.0-Beta-2 by hand because maven rocks
Copied: core/tags/hibernate-3.5.0-Beta-2 (from rev 17890, core/trunk)
15 years, 1 month
- 1
- 0
Hibernate SVN: r17890 - in core/trunk: annotations and 25 other directories.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2009-11-02 13:09:43 -0500 (Mon, 02 Nov 2009)
New Revision: 17890
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/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:
prep 3.5.0-Beta-2 by hand because maven rocks
Modified: core/trunk/annotations/pom.xml
===================================================================
--- core/trunk/annotations/pom.xml 2009-11-02 17:15:23 UTC (rev 17889)
+++ core/trunk/annotations/pom.xml 2009-11-02 18:09:43 UTC (rev 17890)
@@ -29,7 +29,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Beta-2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/cache-ehcache/pom.xml
===================================================================
--- core/trunk/cache-ehcache/pom.xml 2009-11-02 17:15:23 UTC (rev 17889)
+++ core/trunk/cache-ehcache/pom.xml 2009-11-02 18:09:43 UTC (rev 17890)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Beta-2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/cache-infinispan/pom.xml
===================================================================
--- core/trunk/cache-infinispan/pom.xml 2009-11-02 17:15:23 UTC (rev 17889)
+++ core/trunk/cache-infinispan/pom.xml 2009-11-02 18:09:43 UTC (rev 17890)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Beta-2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/cache-jbosscache/pom.xml
===================================================================
--- core/trunk/cache-jbosscache/pom.xml 2009-11-02 17:15:23 UTC (rev 17889)
+++ core/trunk/cache-jbosscache/pom.xml 2009-11-02 18:09:43 UTC (rev 17890)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Beta-2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/cache-oscache/pom.xml
===================================================================
--- core/trunk/cache-oscache/pom.xml 2009-11-02 17:15:23 UTC (rev 17889)
+++ core/trunk/cache-oscache/pom.xml 2009-11-02 18:09:43 UTC (rev 17890)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Beta-2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/cache-swarmcache/pom.xml
===================================================================
--- core/trunk/cache-swarmcache/pom.xml 2009-11-02 17:15:23 UTC (rev 17889)
+++ core/trunk/cache-swarmcache/pom.xml 2009-11-02 18:09:43 UTC (rev 17890)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Beta-2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/connection-c3p0/pom.xml
===================================================================
--- core/trunk/connection-c3p0/pom.xml 2009-11-02 17:15:23 UTC (rev 17889)
+++ core/trunk/connection-c3p0/pom.xml 2009-11-02 18:09:43 UTC (rev 17890)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Beta-2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/connection-proxool/pom.xml
===================================================================
--- core/trunk/connection-proxool/pom.xml 2009-11-02 17:15:23 UTC (rev 17889)
+++ core/trunk/connection-proxool/pom.xml 2009-11-02 18:09:43 UTC (rev 17890)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Beta-2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/core/pom.xml
===================================================================
--- core/trunk/core/pom.xml 2009-11-02 17:15:23 UTC (rev 17889)
+++ core/trunk/core/pom.xml 2009-11-02 18:09:43 UTC (rev 17890)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Beta-2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/distribution/pom.xml
===================================================================
--- core/trunk/distribution/pom.xml 2009-11-02 17:15:23 UTC (rev 17889)
+++ core/trunk/distribution/pom.xml 2009-11-02 18:09:43 UTC (rev 17890)
@@ -32,7 +32,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Beta-2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/documentation/envers/pom.xml
===================================================================
--- core/trunk/documentation/envers/pom.xml 2009-11-02 17:15:23 UTC (rev 17889)
+++ core/trunk/documentation/envers/pom.xml 2009-11-02 18:09:43 UTC (rev 17890)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Beta-2</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/documentation/jbosscache2/pom.xml
===================================================================
--- core/trunk/documentation/jbosscache2/pom.xml 2009-11-02 17:15:23 UTC (rev 17889)
+++ core/trunk/documentation/jbosscache2/pom.xml 2009-11-02 18:09:43 UTC (rev 17890)
@@ -34,13 +34,13 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Beta-2</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-jbc-manual</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Beta-2</version>
<packaging>jdocbook</packaging>
<name>Hibernate/JBoss Cache 3 Reference Manual</name>
Modified: core/trunk/documentation/manual/pom.xml
===================================================================
--- core/trunk/documentation/manual/pom.xml 2009-11-02 17:15:23 UTC (rev 17889)
+++ core/trunk/documentation/manual/pom.xml 2009-11-02 18:09:43 UTC (rev 17890)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Beta-2</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/documentation/pom.xml
===================================================================
--- core/trunk/documentation/pom.xml 2009-11-02 17:15:23 UTC (rev 17889)
+++ core/trunk/documentation/pom.xml 2009-11-02 18:09:43 UTC (rev 17890)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Beta-2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/entitymanager/pom.xml
===================================================================
--- core/trunk/entitymanager/pom.xml 2009-11-02 17:15:23 UTC (rev 17889)
+++ core/trunk/entitymanager/pom.xml 2009-11-02 18:09:43 UTC (rev 17890)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Beta-2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/envers/pom.xml
===================================================================
--- core/trunk/envers/pom.xml 2009-11-02 17:15:23 UTC (rev 17889)
+++ core/trunk/envers/pom.xml 2009-11-02 18:09:43 UTC (rev 17890)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Beta-2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/hibernate-maven-plugin/pom.xml
===================================================================
--- core/trunk/hibernate-maven-plugin/pom.xml 2009-11-02 17:15:23 UTC (rev 17889)
+++ core/trunk/hibernate-maven-plugin/pom.xml 2009-11-02 18:09:43 UTC (rev 17890)
@@ -27,7 +27,7 @@
<parent>
<artifactId>hibernate-parent</artifactId>
<groupId>org.hibernate</groupId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Beta-2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/jdbc3-testing/pom.xml
===================================================================
--- core/trunk/jdbc3-testing/pom.xml 2009-11-02 17:15:23 UTC (rev 17889)
+++ core/trunk/jdbc3-testing/pom.xml 2009-11-02 18:09:43 UTC (rev 17890)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Beta-2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/jdbc4-testing/pom.xml
===================================================================
--- core/trunk/jdbc4-testing/pom.xml 2009-11-02 17:15:23 UTC (rev 17889)
+++ core/trunk/jdbc4-testing/pom.xml 2009-11-02 18:09:43 UTC (rev 17890)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Beta-2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/jmx/pom.xml
===================================================================
--- core/trunk/jmx/pom.xml 2009-11-02 17:15:23 UTC (rev 17889)
+++ core/trunk/jmx/pom.xml 2009-11-02 18:09:43 UTC (rev 17890)
@@ -29,7 +29,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Beta-2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/parent/pom.xml
===================================================================
--- core/trunk/parent/pom.xml 2009-11-02 17:15:23 UTC (rev 17889)
+++ core/trunk/parent/pom.xml 2009-11-02 18:09:43 UTC (rev 17890)
@@ -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-Beta-2</version>
<name>Hibernate Core Parent POM</name>
<description>The base POM for all Hibernate Core modules.</description>
@@ -54,9 +54,9 @@
</licenses>
<scm>
- <connection>scm:svn:https://svn.jboss.org/repos/hibernate/core/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/trunk</developerConnection>
- <url>https://svn.jboss.org/repos/hibernate/core/trunk</url>
+ <connection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.5.0-B...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.5.0-B...</developerConnection>
+ <url>https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.5.0-Beta-2</url>
</scm>
<ciManagement>
Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml 2009-11-02 17:15:23 UTC (rev 17889)
+++ core/trunk/pom.xml 2009-11-02 18:09:43 UTC (rev 17890)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Beta-2</version>
<relativePath>parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/testing/pom.xml
===================================================================
--- core/trunk/testing/pom.xml 2009-11-02 17:15:23 UTC (rev 17889)
+++ core/trunk/testing/pom.xml 2009-11-02 18:09:43 UTC (rev 17890)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Beta-2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/testsuite/pom.xml
===================================================================
--- core/trunk/testsuite/pom.xml 2009-11-02 17:15:23 UTC (rev 17889)
+++ core/trunk/testsuite/pom.xml 2009-11-02 18:09:43 UTC (rev 17890)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Beta-2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/tutorials/eg/pom.xml
===================================================================
--- core/trunk/tutorials/eg/pom.xml 2009-11-02 17:15:23 UTC (rev 17889)
+++ core/trunk/tutorials/eg/pom.xml 2009-11-02 18:09:43 UTC (rev 17890)
@@ -32,7 +32,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-tutorials</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Beta-2</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: core/trunk/tutorials/pom.xml
===================================================================
--- core/trunk/tutorials/pom.xml 2009-11-02 17:15:23 UTC (rev 17889)
+++ core/trunk/tutorials/pom.xml 2009-11-02 18:09:43 UTC (rev 17890)
@@ -31,7 +31,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Beta-2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/tutorials/web/pom.xml
===================================================================
--- core/trunk/tutorials/web/pom.xml 2009-11-02 17:15:23 UTC (rev 17889)
+++ core/trunk/tutorials/web/pom.xml 2009-11-02 18:09:43 UTC (rev 17890)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-tutorials</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Beta-2</version>
<relativePath>../pom.xml</relativePath>
</parent>
15 years, 1 month
- 1
- 0
Hibernate SVN: r17889 - core/trunk.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2009-11-02 12:15:23 -0500 (Mon, 02 Nov 2009)
New Revision: 17889
Modified:
core/trunk/changelog.txt
Log:
prep 3.5.0-Beta-2
Modified: core/trunk/changelog.txt
===================================================================
--- core/trunk/changelog.txt 2009-11-02 16:52:02 UTC (rev 17888)
+++ core/trunk/changelog.txt 2009-11-02 17:15:23 UTC (rev 17889)
@@ -5,6 +5,89 @@
refer to the particular case on JIRA using the issue tracking number to learn
more about each case.
+
+Changes in version 3.5.0-Beta-2 (2009.11.02)
+-------------------------------------------
+
+** Sub-task
+ * [HHH-4047] - Phase 1 - API & implement join-strategy
+ * [HHH-4196] - Implement JPA 2.0 criteria apis (building)
+ * [HHH-4202] - Implement JPA 2.0 metamodel APIs
+ * [HHH-4528] - Read mapping annotations from entity properties rather than the composite pk
+ * [HHH-4533] - Support for @MappedSuperclass such that we can build javax.persistence.metamodel.MappedSuperclassType
+ * [HHH-4537] - Expose Members for MappedSuperclass properties
+
+** Bug
+ * [HHH-1724] - Critieria needs to be aligned with new aggreation type rules
+ * [HHH-3817] - JBC second level cache integration can cache stale collection data
+ * [HHH-3818] - Hibernate/JBC integration doesn't property handle Entity/CollectionRegionAccessStrategy evictAll
+ * [HHH-4095] - bug in org.hibernate.Hibernate.createBlob( InputStream in )
+ * [HHH-4100] - Problems with Envers docbook sources
+ * [HHH-4105] - SessionFactory mispells method to obtain fetch profile definition
+ * [HHH-4114] - ASTParserLoadingTest fails due to missing "bit_length" function
+ * [HHH-4115] - FooBarTest - "operator does not exist: character varying = integer"
+ * [HHH-4435] - DataVersionAdapter.newerThan incorrect when comparing to self
+ * [HHH-4437] - ToOneDelegateSessionImplementor breaks Hibernate.getClass(auditedEntity.proxyOfnotAuditedEntity)
+ * [HHH-4441] - SessionImpl serialization violates java serialization spec
+ * [HHH-4447] - Envers proxy.getId() returns null if proxy was not initialized yet
+ * [HHH-4449] - NPE during inserting new audited entity with reference to another proxy entity if proxy.lazyInitializer.session is null
+ * [HHH-4463] - Native queries should not be automatically paginated in getSingleResult() as it fails for some DB and or queries
+ * [HHH-4475] - Constants point to non-existing default JBC/JGroups config file locations
+ * [HHH-4486] - Account for MySQL's <DROP TEMPORARY TABLE> statement
+ * [HHH-4494] - cglib log warning says BytecodeProvider impl is considered deprecated
+ * [HHH-4500] - MSSQL, Oracle - Mapping inconsistency
+ * [HHH-4503] - Sybase - Annotations - unit tests using LOBs fail
+ * [HHH-4507] - Persistence units in entitymanager's testsuite are using fixed hsqldb configuration
+ * [HHH-4513] - AnotationConfiguration does not honor hibernate.validator.apply_to_ddl property in case Hibernate Validator 4 is activated
+ * [HHH-4522] - CallbackAndDirtyTest throws exception when run against PostgreSQL
+ * [HHH-4525] - Trunk is not including the newly added modules to the distribution bundle
+ * [HHH-4532] - Unit Tests in test/idgen/enhanced/forcedtable need update
+
+** Improvement
+ * [HHH-3461] - Enhance DialectFactory to support Sybase Adaptive Server Anywhere
+ * [HHH-4364] - Support @NamedQuery on a @MappedSuperclass (Sharath Reddy)
+ * [HHH-4382] - @ManyToOne not working wth @Formula
+ * [HHH-4397] - Split test involving database specific features (like sequence / identity)
+ * [HHH-4405] - Integrate new long string and binary property types in core with annotations
+ * [HHH-4415] - TestCase could check for superclass of Dialect before skipping it
+ * [HHH-4442] - Change StandardDialectResolver to use SybaseASE15Dialect over deprecated SybaseDialect
+ * [HHH-4443] - Allow generic handling of any Hibernate type for post-insert generated identifiers
+ * [HHH-4476] - Move cache-jbosscache to JBoss Cache 3.2.1
+ * [HHH-4484] - When JBoss Cache is configured for INVALIDATION don't send cluster message on entity insert
+ * [HHH-4502] - Update database profiles in pom.xml
+ * [HHH-4508] - Typo in DialectFactory - avalable should be available
+ * [HHH-4523] - Some of the tests in the entitymanager have hard coded connection settings - these tests should use filtered connection settings
+ * [HHH-4526] - Add better metainf information tot he hibernate all jar gennerated for dist
+
+** New Feature
+ * [HHH-1012] - Index not created by SchemaUpdate
+ * [HHH-1480] - JOIN precendence rules per SQL-99
+ * [HHH-3000] - Allow a TypeDef to be associated with a class (Sharath Reddy)
+ * [HHH-4103] - Implement an Infinispan 2nd level cache provider
+ * [HHH-4232] - TypeDef support on @Embeddable or @MappedSuperClass classes (Sharath Reddy)
+ * [HHH-4332] - Filters for MappedSuperClass
+ * [HHH-4473] - Create documentation to explain the usage of the new 'defaultForType' attribute of the TypeDef annotation
+ * [HHH-4479] - We should be able to implement Joins using formulas with Annotations
+ * [HHH-4512] - TypeDef annotation should support both 'name' and 'defaultForType' attributes
+
+** Patch
+ * [HHH-3972] - Adding FETCH FIRST and OFFSET support to DerbyDialect
+ * [HHH-4440] - Support for column-level read/write fragments (Rob Hasselbaum)
+ * [HHH-4488] - ListProxy, MapProxy etc. - problems during marshalling/demarchalling
+
+** Task
+ * [HHH-2412] - Support for JDBC4
+ * [HHH-3580] - import entitymanager into core as a module
+ * [HHH-3849] - Disable lock striping in JBoss Cache configs
+ * [HHH-4355] - Allow running tests against different databases by using a simple switch
+ * [HHH-4485] - Replace the JBoss Cache integration configuration properties with "jbc2"-less versions
+ * [HHH-4487] - Restore versions of the old public API jbc2 package classes
+ * [HHH-4499] - Account for modules needing JDK 1.6
+ * [HHH-4501] - Use Maven wagon-scm provider for release deployments
+ * [HHH-4530] - Change the docbook style for Annotations and EntityManager to the latest styles used in the other Core modules
+ * [HHH-4538] - Update to Bean Validation 1.0.0 and Hibernate Validator 4.0.0
+
+
Changes in version 3.5.0.Beta-1 (2009.08.18)
-------------------------------------------
15 years, 1 month
- 1
- 0
Hibernate SVN: r17888 - core/trunk.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2009-11-02 11:52:02 -0500 (Mon, 02 Nov 2009)
New Revision: 17888
Modified:
core/trunk/pom.xml
Log:
remove stray character
Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml 2009-11-02 16:49:28 UTC (rev 17887)
+++ core/trunk/pom.xml 2009-11-02 16:52:02 UTC (rev 17888)
@@ -20,7 +20,7 @@
<module>parent</module>
<module>core</module>
<module>cache-ehcache</module>
- <module>cache-jbosscache</module>n
+ <module>cache-jbosscache</module>
<module>cache-oscache</module>
<module>cache-swarmcache</module>
<module>connection-c3p0</module>
15 years, 1 month
- 1
- 0
Hibernate SVN: r17887 - core/trunk.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2009-11-02 11:49:28 -0500 (Mon, 02 Nov 2009)
New Revision: 17887
Modified:
core/trunk/pom.xml
Log:
Remove tutorials from the build for the time being
Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml 2009-11-02 16:46:17 UTC (rev 17886)
+++ core/trunk/pom.xml 2009-11-02 16:49:28 UTC (rev 17887)
@@ -20,7 +20,7 @@
<module>parent</module>
<module>core</module>
<module>cache-ehcache</module>
- <module>cache-jbosscache</module>
+ <module>cache-jbosscache</module>n
<module>cache-oscache</module>
<module>cache-swarmcache</module>
<module>connection-c3p0</module>
@@ -31,7 +31,9 @@
<module>testing</module>
<module>testsuite</module>
<module>jdbc3-testing</module>
+<!--
<module>tutorials</module>
+-->
<!--
Need to scope bytecode providers first...
<module>bytecode-cglib</module>
15 years, 1 month
- 1
- 0
Hibernate SVN: r17886 - in core/trunk/entitymanager/src: test/java/org/hibernate/ejb/test/metadata and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2009-11-02 11:46:17 -0500 (Mon, 02 Nov 2009)
New Revision: 17886
Added:
core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/StaticMetadataTest.java
Modified:
core/trunk/entitymanager/src/main/java/org/hibernate/ejb/metamodel/AbstractIdentifiableType.java
core/trunk/entitymanager/src/main/java/org/hibernate/ejb/metamodel/MetadataContext.java
core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Animal.java
core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Cat.java
core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Cattish.java
core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Dog.java
core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Feline.java
core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Thing.java
Log:
HHH-4202 - Implement JPA 2.0 metamodel APIs
Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/metamodel/AbstractIdentifiableType.java
===================================================================
--- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/metamodel/AbstractIdentifiableType.java 2009-11-01 14:31:50 UTC (rev 17885)
+++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/metamodel/AbstractIdentifiableType.java 2009-11-02 16:46:17 UTC (rev 17886)
@@ -189,6 +189,10 @@
return isVersioned;
}
+ public boolean hasDeclaredVersionAttribute() {
+ return isVersioned && version != null;
+ }
+
/**
* {@inheritDoc}
*/
@@ -223,6 +227,16 @@
}
/**
+ * For used to retrieve the declared version when populating the static metamodel.
+ *
+ * @return The declared
+ */
+ public SingularAttribute<X, ?> getDeclaredVersion() {
+ checkDeclaredVersion();
+ return version;
+ }
+
+ /**
* Centralized check to ensure the version (if one) is actually declared on the class mapped here, as opposed to a
* super class.
*/
Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/metamodel/MetadataContext.java
===================================================================
--- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/metamodel/MetadataContext.java 2009-11-01 14:31:50 UTC (rev 17885)
+++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/metamodel/MetadataContext.java 2009-11-02 16:46:17 UTC (rev 17886)
@@ -29,16 +29,17 @@
import java.util.Set;
import java.util.List;
import java.util.ArrayList;
+import java.lang.reflect.Field;
import javax.persistence.metamodel.Attribute;
import javax.persistence.metamodel.SingularAttribute;
-import javax.swing.*;
+import javax.persistence.metamodel.IdentifiableType;
import org.hibernate.mapping.MappedSuperclass;
import org.hibernate.mapping.PersistentClass;
import org.hibernate.mapping.Property;
+import org.hibernate.mapping.Component;
import org.hibernate.engine.SessionFactoryImplementor;
import org.hibernate.annotations.common.AssertionFailure;
-import org.hibernate.AnnotationException;
/**
* Defines a context for storing information during the building of the {@link MetamodelImpl}.
@@ -163,6 +164,12 @@
Iterator<Property> properties = ( Iterator<Property> ) safeMapping.getDeclaredPropertyIterator();
while ( properties.hasNext() ) {
final Property property = properties.next();
+ if ( property.getValue() == safeMapping.getIdentifierMapper() ) {
+ // property represents special handling for id-class mappings but we have already
+ // accounted for the embedded property mappings in #applyIdMetadata &&
+ // #buildIdClassAttributes
+ continue;
+ }
final Attribute attribute = attributeFactory.buildAttribute( jpa2Mapping, property, true );
jpa2Mapping.getBuilder().addAttribute( attribute );
}
@@ -190,8 +197,13 @@
throw new AssertionFailure( "Unexpected mapping type: " + mapping.getClass() );
}
}
+
+ for ( EmbeddableTypeImpl embeddable : embeddables.values() ) {
+ populateStaticMetamodel( embeddable );
+ }
}
+
private <X> void applyIdMetadata(PersistentClass persistentClass, EntityTypeImpl<X> jpaEntityType) {
if ( persistentClass.hasIdentifierProperty() ) {
final Property declaredIdentifierProperty = persistentClass.getDeclaredIdentifierProperty();
@@ -289,13 +301,57 @@
private final Set<Class> processedMetamodelClasses = new HashSet<Class>();
private <X> void registerAttributes(Class metamodelClass, AbstractManagedType<X> managedType) {
- if ( processedMetamodelClasses.add( metamodelClass ) ) {
+ if ( ! processedMetamodelClasses.add( metamodelClass ) ) {
return;
}
// push the attributes on to the metamodel class...
+ for ( Attribute<X, ?> attribute : managedType.getDeclaredAttributes() ) {
+ registerAttribute( metamodelClass, attribute );
+ }
+
+ if ( IdentifiableType.class.isInstance( managedType ) ) {
+ final AbstractIdentifiableType<X> entityType = ( AbstractIdentifiableType<X> ) managedType;
+
+ // handle version
+ if ( entityType.hasDeclaredVersionAttribute() ) {
+ registerAttribute( metamodelClass, entityType.getDeclaredVersion() );
+ }
+
+ // handle id-class mappings specially
+ if ( ! entityType.hasSingleIdAttribute() ) {
+ final Set<SingularAttribute<? super X, ?>> attributes = entityType.getIdClassAttributes();
+ if ( attributes != null ) {
+ for ( SingularAttribute<? super X, ?> attribute : attributes ) {
+ registerAttribute( metamodelClass, attribute );
+ }
+ }
+ }
+ }
}
+ private <X> void registerAttribute(Class metamodelClass, Attribute<X, ?> attribute) {
+ final String name = attribute.getName();
+ try {
+ Field field = metamodelClass.getDeclaredField( name );
+ field.setAccessible( true ); // should be public anyway, but to be sure...
+ field.set( null, attribute );
+ }
+ catch ( NoSuchFieldException e ) {
+ // todo : exception type?
+ throw new AssertionFailure(
+ "Unable to locate static metamodel field : " + metamodelClass.getName() + '#' + name
+ );
+ }
+ catch ( IllegalAccessException e ) {
+ // todo : exception type?
+ throw new AssertionFailure(
+ "Unable to inject static metamodel attribute : " + metamodelClass.getName() + '#' + name,
+ e
+ );
+ }
+ }
+
public MappedSuperclassTypeImpl<?> locateMappedSuperclassType(MappedSuperclass mappedSuperclass) {
return mappedSuperclassByMappedSuperclassMapping.get(mappedSuperclass);
}
Modified: core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Animal.java
===================================================================
--- core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Animal.java 2009-11-01 14:31:50 UTC (rev 17885)
+++ core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Animal.java 2009-11-02 16:46:17 UTC (rev 17886)
@@ -1,3 +1,26 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by
+ * third-party contributors as indicated by either @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.ejb.test.metadata;
import javax.persistence.MappedSuperclass;
Modified: core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Cat.java
===================================================================
--- core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Cat.java 2009-11-01 14:31:50 UTC (rev 17885)
+++ core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Cat.java 2009-11-02 16:46:17 UTC (rev 17886)
@@ -1,3 +1,26 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by
+ * third-party contributors as indicated by either @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.ejb.test.metadata;
import javax.persistence.Entity;
Modified: core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Cattish.java
===================================================================
--- core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Cattish.java 2009-11-01 14:31:50 UTC (rev 17885)
+++ core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Cattish.java 2009-11-02 16:46:17 UTC (rev 17886)
@@ -1,3 +1,26 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by
+ * third-party contributors as indicated by either @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.ejb.test.metadata;
import javax.persistence.MappedSuperclass;
Modified: core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Dog.java
===================================================================
--- core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Dog.java 2009-11-01 14:31:50 UTC (rev 17885)
+++ core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Dog.java 2009-11-02 16:46:17 UTC (rev 17886)
@@ -1,3 +1,26 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by
+ * third-party contributors as indicated by either @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.ejb.test.metadata;
import javax.persistence.Entity;
Modified: core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Feline.java
===================================================================
--- core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Feline.java 2009-11-01 14:31:50 UTC (rev 17885)
+++ core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Feline.java 2009-11-02 16:46:17 UTC (rev 17886)
@@ -1,3 +1,26 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by
+ * third-party contributors as indicated by either @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.ejb.test.metadata;
import javax.persistence.Entity;
Copied: core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/StaticMetadataTest.java (from rev 17885, core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/MetadataTest.java)
===================================================================
--- core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/StaticMetadataTest.java (rev 0)
+++ core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/StaticMetadataTest.java 2009-11-02 16:46:17 UTC (rev 17886)
@@ -0,0 +1,134 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by
+ * third-party contributors as indicated by either @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.ejb.test.metadata;
+
+import java.util.Set;
+import javax.persistence.metamodel.Attribute;
+import javax.persistence.metamodel.Bindable;
+import javax.persistence.metamodel.EmbeddableType;
+import javax.persistence.metamodel.PluralAttribute;
+import javax.persistence.metamodel.Type;
+
+import org.hibernate.ejb.test.TestCase;
+
+/**
+ * @author Steve Ebersole
+ */
+public class StaticMetadataTest extends TestCase {
+
+ public void testInjections() throws Exception {
+ // Address (embeddable)
+ assertNotNull( Address_.address1 );
+ assertNotNull( Address_.address2 );
+ assertNotNull( Address_.city );
+ final EmbeddableType<Address> addressType = (EmbeddableType<Address>) House_.address.getType();
+ assertEquals( addressType.getDeclaredSingularAttribute( "address1" ), Address_.address1 );
+ assertEquals( addressType.getDeclaredSingularAttribute( "address2" ), Address_.address2 );
+ assertTrue( Address_.address1.isOptional() );
+ assertFalse( Address_.address2.isOptional() );
+
+ // Animal (mapped superclass)
+ assertNotNull( Animal_.id );
+ assertTrue( Animal_.id.isId() );
+ assertEquals( Long.class, Animal_.id.getJavaType() );
+ assertNotNull( Animal_.legNbr );
+ assertEquals( Integer.class, Animal_.legNbr.getJavaType() );
+
+ // Cat (hierarchy)
+ assertNotNull( Cat_.id );
+ assertNotNull( Cat_.id.isId() );
+ assertEquals( Animal.class, Cat_.id.getJavaMember().getDeclaringClass() );
+ assertNotNull( Cat_.nickname );
+
+ // FoodItem
+ assertNotNull( FoodItem_.version );
+ assertTrue( FoodItem_.version.isVersion() );
+
+ // Fridge
+ assertNotNull( Fridge_.id );
+ assertTrue( Fridge_.id.isId() );
+ assertEquals( Long.class, Fridge_.id.getJavaType() );
+ assertNotNull( Fridge_.temperature );
+ assertEquals( "temperature", Fridge_.temperature.getName() );
+ assertEquals( Fridge.class, Fridge_.temperature.getDeclaringType().getJavaType() );
+ assertEquals( Integer.class, Fridge_.temperature.getJavaType() );
+ assertEquals( Integer.class, Fridge_.temperature.getBindableJavaType() );
+ assertEquals( Integer.class, Fridge_.temperature.getType().getJavaType() );
+ assertEquals( Bindable.BindableType.SINGULAR_ATTRIBUTE, Fridge_.temperature.getBindableType() );
+ assertEquals( Type.PersistenceType.BASIC, Fridge_.temperature.getType().getPersistenceType() );
+ assertEquals( Attribute.PersistentAttributeType.BASIC, Fridge_.temperature.getPersistentAttributeType() );
+ assertFalse( Fridge_.temperature.isId() );
+ assertFalse( Fridge_.temperature.isOptional() );
+ assertFalse( Fridge_.temperature.isAssociation() );
+ assertFalse( Fridge_.temperature.isCollection() );
+ assertFalse( Fridge_.brand.isOptional() );
+
+ // House (embedded id)
+ assertNotNull( House_.key );
+ assertTrue( House_.key.isId() );
+ assertEquals( Attribute.PersistentAttributeType.EMBEDDED, House_.key.getPersistentAttributeType() );
+ assertNotNull( House_.address );
+ assertEquals( Attribute.PersistentAttributeType.EMBEDDED, House_.address.getPersistentAttributeType() );
+ assertFalse( House_.address.isCollection() );
+ assertFalse( House_.address.isAssociation() );
+ assertNotNull( House_.rooms );
+ assertTrue( House_.rooms.isAssociation() );
+ assertTrue( House_.rooms.isCollection() );
+ assertEquals( Attribute.PersistentAttributeType.ELEMENT_COLLECTION, House_.rooms.getPersistentAttributeType() );
+ assertEquals( Room.class, House_.rooms.getBindableJavaType() );
+ assertEquals( Bindable.BindableType.PLURAL_ATTRIBUTE, House_.rooms.getBindableType() );
+ assertEquals( Set.class, House_.rooms.getJavaType() );
+ assertEquals( PluralAttribute.CollectionType.SET, House_.rooms.getCollectionType() );
+ assertEquals( Type.PersistenceType.EMBEDDABLE, House_.rooms.getElementType().getPersistenceType() );
+ assertNotNull( House_.roomsByName );
+ assertEquals( String.class, House_.roomsByName.getKeyJavaType() );
+ assertEquals( Type.PersistenceType.BASIC, House_.roomsByName.getKeyType().getPersistenceType() );
+ assertEquals( PluralAttribute.CollectionType.MAP, House_.roomsByName.getCollectionType() );
+ assertNotNull( House_.roomsBySize );
+ assertEquals( Type.PersistenceType.EMBEDDABLE, House_.roomsBySize.getElementType().getPersistenceType() );
+ assertEquals( PluralAttribute.CollectionType.LIST, House_.roomsBySize.getCollectionType() );
+
+ // Person (mapped id)
+ assertNotNull( Person_.firstName );
+ assertNotNull( Person_.lastName );
+ assertTrue( Person_.firstName.isId() );
+ assertTrue( Person_.lastName.isId() );
+ assertTrue( Person_.lastName.isId() );
+ }
+
+ @Override
+ public Class[] getAnnotatedClasses() {
+ return new Class[]{
+ Fridge.class,
+ FoodItem.class,
+ Person.class,
+ House.class,
+ Dog.class,
+ Cat.class,
+ Cattish.class,
+ Feline.class
+ };
+ }
+
+}
\ No newline at end of file
Modified: core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Thing.java
===================================================================
--- core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Thing.java 2009-11-01 14:31:50 UTC (rev 17885)
+++ core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Thing.java 2009-11-02 16:46:17 UTC (rev 17886)
@@ -1,3 +1,26 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by
+ * third-party contributors as indicated by either @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.ejb.test.metadata;
import javax.persistence.MappedSuperclass;
15 years, 1 month
- 1
- 0
get back to my office for more details
by boss
Please read the attached letter and get back to my office for more details to proceed further.
Thanks and have a very nice day.
15 years, 1 month
- 1
- 0
get back to my office for more details
by boss
Please read the attached letter and get back to my office for more details to proceed further.
Thanks and have a very nice day.
15 years, 1 month
- 1
- 0
Hibernate SVN: r17885 - search/trunk/src/main/docbook/en-US/modules.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2009-11-01 09:31:50 -0500 (Sun, 01 Nov 2009)
New Revision: 17885
Modified:
search/trunk/src/main/docbook/en-US/modules/mapping.xml
Log:
HSEARCH-324 Added documentation for dynamic boost
Modified: search/trunk/src/main/docbook/en-US/modules/mapping.xml
===================================================================
--- search/trunk/src/main/docbook/en-US/modules/mapping.xml 2009-10-30 13:58:05 UTC (rev 17884)
+++ search/trunk/src/main/docbook/en-US/modules/mapping.xml 2009-11-01 14:31:50 UTC (rev 17885)
@@ -33,9 +33,9 @@
through annotations. There is no need for xml mapping files. In fact there
is currently no xml configuration option available (see <ulink
url="http://opensource.atlassian.com/projects/hibernate/browse/HSEARCH-210">HSEARCH-210</ulink>).
- You can still use hibernate mapping files for the basic Hibernate
- configuration, but the Search specific configuration has to be expressed via
- annotations.</para>
+ You can still use Hibernate mapping files for the basic Hibernate
+ configuration, but the Hibernate Search specific configuration has to be
+ expressed via annotations.</para>
<section id="search-mapping-entity" revision="3">
<title>Mapping an entity</title>
@@ -73,9 +73,9 @@
<para>For each property (or attribute) of your entity, you have the
ability to describe how it will be indexed. The default (no annotation
- present) means that the property is completely ignored by the indexing
- process. <literal>@Field</literal> does declare a property as indexed.
- When indexing an element to a Lucene document you can specify how it is
+ present) means that the property is ignored by the indexing process.
+ <literal>@Field</literal> does declare a property as indexed. When
+ indexing an element to a Lucene document you can specify how it is
indexed:</para>
<itemizedlist>
@@ -181,9 +181,10 @@
<para>Whether or not you want to tokenize a property depends on whether
you wish to search the element as is, or by the words it contains. It
- make sense to tokenize a text field, but tokenizing a date field
- probably not. Note that fields used for sorting must not be
- tokenized.</para>
+ make sense to tokenize a text field, but probably not a date field.
+ <note>
+ <para>Fields used for sorting must not be tokenized.</para>
+ </note></para>
<para>Finally, the id property of an entity is a special property used
by Hibernate Search to ensure index unicity of a given entity. By
@@ -193,7 +194,7 @@
can omit @DocumentId. The chosen entity id will also be used as document
id.</para>
- <example>
+ <example id="example-annotated-entity">
<title>Adding <classname>@DocumentId</classname> ad
<classname>@Field</classname> annotations to an indexed entity</title>
@@ -215,8 +216,8 @@
}</programlisting>
</example>
- <para>The above annotations define an index with three fields:
- <literal>id</literal> , <literal>Abstract</literal> and
+ <para><xref linkend="example-annotated-entity" /> define an index with
+ three fields: <literal>id</literal> , <literal>Abstract</literal> and
<literal>text</literal> . Note that by default the field name is
decapitalized, following the JavaBean specification</para>
</section>
@@ -231,7 +232,7 @@
index it twice - once tokenized and once untokenized. @Fields allows to
achieve this goal.</para>
- <example>
+ <example id="example-fields-annotation">
<title>Using @Fields to map a property multiple times</title>
<programlisting>@Entity
@@ -249,7 +250,8 @@
}</programlisting>
</example>
- <para>The field <literal>summary</literal> is indexed twice, once as
+ <para>In <xref linkend="example-fields-annotation" /> the field
+ <literal>summary</literal> is indexed twice, once as
<literal>summary</literal> in a tokenized way, and once as
<literal>summary_forSort</literal> in an untokenized way. @Field
supports 2 attributes useful when @Fields is used:</para>
@@ -514,7 +516,7 @@
</example>
</section>
- <section>
+ <section id="section-boost-annotation">
<title>Boost factor</title>
<para>Lucene has the notion of <emphasis>boost factor</emphasis>. It's a
@@ -565,6 +567,63 @@
from Otis Gospodnetic and Erik Hatcher.</para>
</section>
+ <section>
+ <title id="section-dynamic-boost">Dynamic boost factor</title>
+
+ <para>The <literal>@Boost </literal>annotation used in <xref
+ linkend="section-boost-annotation" /> defines a static boost factor
+ which is is independent of the state of of the indexed entity at
+ runtime. However, there are usecases in which the boost factor may
+ depends on the actual state of the entity. In this case you can use the
+ <literal>@DynamicBoost </literal>annotation together with an
+ accompanying custom <classname>BoostStrategy</classname>.<example
+ id="example-dynamic-boosting">
+ <title>Dynamic boost examle</title>
+
+ <programlisting>public enum PersonType {
+ NORMAL,
+ VIP
+}
+
+@Entity
+@Indexed
+<emphasis role="bold">@DynamicBoost(impl = VIPBoostStrategy.class)</emphasis>
+public class Person {
+ private PersonType type;
+
+ // ....
+}
+
+public class VIPBoostStrategy implements BoostStrategy {
+ <emphasis role="bold">public float defineBoost(Object value)</emphasis> {
+ Person person = ( Person ) value;
+ if ( person.getType().equals( PersonType.VIP ) ) {
+ return 2.0f;
+ }
+ else {
+ return 1.0f;
+ }
+ }
+}</programlisting>
+ </example>In <xref linkend="example-dynamic-boosting" /> a dynamic
+ boost is defined on class level specifying
+ <classname>VIPBoostStrategy</classname> as implementation of the
+ <classname>BoostStrategy</classname> interface to be used at indexing
+ time. You can place the <literal>@DynamicBoost</literal> either at class
+ or field level. Depending on the placement of the annotation either the
+ whole entity is passed to the <methodname>defineBoost</methodname>
+ method or just the annotated field/property value. It's up to you to
+ cast the passed object to the correct type. In the example all indexed
+ values of a VIP person would be double as important as the values of a
+ normal person.<note>
+ <para>The specified <classname>BoostStrategy</classname>
+ implementation must define a public no-arg constructor.</para>
+ </note>Of course you can mix and match <literal>@Boost</literal> and
+ <literal>@DynamicBoost</literal> annotations in your entity. All defined
+ boost factors are cummulative as described in <xref
+ linkend="section-boost-annotation" />.</para>
+ </section>
+
<section id="analyzer">
<title>Analyzer</title>
15 years, 1 month
- 1
- 0