[Hibernate-commits] Hibernate Code SVN: r9813 - in trunk/HibernateExt/metadata: . src/java/org/hibernate/cfg/annotations

[<hib...@li...>]

Author: epbernard
Date: 2006-04-27 11:15:03 -0400 (Thu, 27 Apr 2006)
New Revision: 9813

Modified:
   trunk/HibernateExt/metadata/changelog.txt
   trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/CollectionBinder.java
   trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/Version.java
Log:
ANN-328 and version b

Modified: trunk/HibernateExt/metadata/changelog.txt
===================================================================
--- trunk/HibernateExt/metadata/changelog.txt	2006-04-27 15:05:54 UTC (rev 9812)
+++ trunk/HibernateExt/metadata/changelog.txt	2006-04-27 15:15:03 UTC (rev 9813)
@@ -1,8 +1,8 @@
 Hibernate Annotations Changelog
 ===============================
 
-3.1.0.Beta10 Preview (26-04-2006)
----------------------------------
+3.1.0.Beta10b Preview (27-04-2006)
+----------------------------------
 ** Bug
     * [ANN-292] - @EmbeddedId object containing only @ManyToOne fails / wrong pk generation when@EmbeddedId contains @ManyToOne
     * [ANN-295] - Generators behave like allocationSize+1
@@ -10,6 +10,7 @@
     * [ANN-301] - Validator won't validate "new" (=transient) bean when bean is CGLIB-instrumented
     * [ANN-319] - Make Hibernate Annotations types Serializable and thread safe
     * [ANN-321] - Discriminator column wo @DiscriminatorColumn has the wrong varchar length
+    * [ANN-328] - @javax.persistence.MapKey broken
 
 
 ** Improvement

Modified: trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/CollectionBinder.java
===================================================================
--- trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/CollectionBinder.java	2006-04-27 15:05:54 UTC (rev 9812)
+++ trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/CollectionBinder.java	2006-04-27 15:15:03 UTC (rev 9813)
@@ -254,8 +254,8 @@
 		log.debug( "Collection role: " + StringHelper.qualify( propertyHolder.getPath(), propertyName ) );
 		collection.setRole( StringHelper.qualify( propertyHolder.getPath(), propertyName ) );
 
-		if (mapKeyColumns != null && mapKeyPropertyName != null) {
-			throw new AnnotationException("Cannot mix @javax.persistence.MakKey and @org.hibernate.annotations.MapKey "
+		if (property.isAnnotationPresent( org.hibernate.annotations.MapKey.class) && mapKeyPropertyName != null) {
+			throw new AnnotationException("Cannot mix @javax.persistence.MapKey and @org.hibernate.annotations.MapKey "
 				+ "on the same collection: " + StringHelper.qualify( propertyHolder.getPath(), propertyName ) );
 		}
 

Modified: trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/Version.java
===================================================================
--- trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/Version.java	2006-04-27 15:05:54 UTC (rev 9812)
+++ trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/Version.java	2006-04-27 15:15:03 UTC (rev 9813)
@@ -8,7 +8,7 @@
  * @author Emmanuel Bernard
  */
 public class Version {
-	public static String VERSION = "3.1.0.Beta10";
+	public static String VERSION = "3.1.0.Beta10b";
 	private static Log log = LogFactory.getLog( Version.class );
 
 	static {