[Hibernate-commits] Hibernate Code SVN: r9609 - in trunk/HibernateExt/metadata/src: java/org/hibernate/annotations java/org/hibernate/cfg/annotations test/org/hibernate/test/annotations/entity test/org/hibernate/test/annotations/join test/org/hibernate/test/annotations/various

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

Author: epbernard
Date: 2006-03-12 16:45:27 -0500 (Sun, 12 Mar 2006)
New Revision: 9609

Modified:
   trunk/HibernateExt/metadata/src/java/org/hibernate/annotations/Table.java
   trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/EntityBinder.java
   trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/entity/Forest.java
   trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/join/Cat.java
   trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/various/Vehicule.java
Log:
ANN-262

Modified: trunk/HibernateExt/metadata/src/java/org/hibernate/annotations/Table.java
===================================================================
--- trunk/HibernateExt/metadata/src/java/org/hibernate/annotations/Table.java	2006-03-12 18:03:57 UTC (rev 9608)
+++ trunk/HibernateExt/metadata/src/java/org/hibernate/annotations/Table.java	2006-03-12 21:45:27 UTC (rev 9609)
@@ -16,7 +16,7 @@
 	/**
 	 * name of the targeted table
 	 */
-	String name();
+	String appliesTo();
 
 	/**
 	 * Indexes

Modified: trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/EntityBinder.java
===================================================================
--- trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/EntityBinder.java	2006-03-12 18:03:57 UTC (rev 9608)
+++ trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/EntityBinder.java	2006-03-12 21:45:27 UTC (rev 9609)
@@ -527,7 +527,7 @@
 
 	public void addIndexes(org.hibernate.annotations.Table table) {
 		if ( table == null ) return;
-		String tableName = table.name();
+		String tableName = table.appliesTo();
 		Iterator tables = persistentClass.getTableClosureIterator();
 		Table hibTable = null;
 		while ( tables.hasNext() ) {

Modified: trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/entity/Forest.java
===================================================================
--- trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/entity/Forest.java	2006-03-12 18:03:57 UTC (rev 9608)
+++ trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/entity/Forest.java	2006-03-12 21:45:27 UTC (rev 9609)
@@ -35,7 +35,7 @@
 	@Filter(name="betweenLength"),
 	@Filter(name="minLength", condition=":minLength <= length")
 } )
-...@or...notations.Table(name="Forest", indexes = { @Index(name="idx", columnNames = { "name", "length" } ) } )
+...@or...notations.Table(appliesTo="Forest", indexes = { @Index(name="idx", columnNames = { "name", "length" } ) } )
 public class Forest {
 	private Integer id;
 	private String name;

Modified: trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/join/Cat.java
===================================================================
--- trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/join/Cat.java	2006-03-12 18:03:57 UTC (rev 9608)
+++ trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/join/Cat.java	2006-03-12 21:45:27 UTC (rev 9609)
@@ -21,7 +21,7 @@
 	@SecondaryTable(name="`Cat nbr1`"),
 	@SecondaryTable(name="Cat2", uniqueConstraints={@UniqueConstraint(columnNames={"storyPart2"})})
 })
-@Table(name="Cat", indexes = @Index(name="secondname", columnNames="secondName"))
+@Table(appliesTo="Cat", indexes = @Index(name="secondname", columnNames="secondName"))
 public class Cat implements Serializable {
 
 	private Integer id;

Modified: trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/various/Vehicule.java
===================================================================
--- trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/various/Vehicule.java	2006-03-12 18:03:57 UTC (rev 9608)
+++ trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/various/Vehicule.java	2006-03-12 21:45:27 UTC (rev 9609)
@@ -18,7 +18,7 @@
  */
 @Entity
 @Inheritance(strategy = InheritanceType.JOINED)
-...@or...notations.Table(name="Vehicule",
+...@or...notations.Table(appliesTo="Vehicule",
 		indexes = {
 				@Index(name="improbableindex", columnNames={"registration", "Conductor_fk"} ),
 				@Index(name="secondone", columnNames={"Conductor_fk"} )