[hibernate-commits] Hibernate SVN: r10305 - in trunk/HibernateExt/metadata/src: java/org/hibernate/cfg test/org/hibernate/test/annotations/inheritance/mixed

[hibernate-commits at lists.jboss.org]

Author: epbernard
Date: 2006-08-21 18:23:09 -0400 (Mon, 21 Aug 2006)
New Revision: 10305

Modified:
   trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/AnnotationBinder.java
   trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/inheritance/mixed/Document.java
Log:
minor

Modified: trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/AnnotationBinder.java
===================================================================
--- trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/AnnotationBinder.java	2006-08-21 17:21:49 UTC (rev 10304)
+++ trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/AnnotationBinder.java	2006-08-21 22:23:09 UTC (rev 10305)
@@ -45,6 +45,7 @@
 import javax.persistence.TableGenerator;
 import javax.persistence.Transient;
 import javax.persistence.Version;
+import javax.persistence.Table;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -537,6 +538,11 @@
 					constraints, inheritanceState.hasDenormalizedTable() ? superEntity.getTable() : null
 			);
 		}
+		else {
+			if ( annotatedClass.isAnnotationPresent( Table.class ) ) {
+				log.warn( "Illegal use of @Table in a subclass of a SINGLE_TABLE hierarchy: " + clazzToProcess.getName() );
+			}
+		}
 //		Map<String, Column[]> columnOverride = PropertyHolderBuilder.buildHierarchyColumnOverride(
 //				clazzToProcess,
 //				persistentClass.getClassName()

Modified: trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/inheritance/mixed/Document.java
===================================================================
--- trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/inheritance/mixed/Document.java	2006-08-21 17:21:49 UTC (rev 10304)
+++ trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/inheritance/mixed/Document.java	2006-08-21 22:23:09 UTC (rev 10305)
@@ -5,6 +5,7 @@
 import javax.persistence.DiscriminatorValue;
 import javax.persistence.Entity;
 import javax.persistence.SecondaryTable;
+import javax.persistence.Table;
 
 /**
  * @author Emmanuel Bernard
@@ -12,6 +13,7 @@
 @Entity
 @DiscriminatorValue("D")
 @SecondaryTable(name = "DocumentMixed")
+ at Table(name="Document_Wrong") //illegal use, a warn is raised
 public class Document extends File {
 	private int size;