[Hibernate-commits] Hibernate Code SVN: r10141 - in trunk/HibernateExt/tools/src: java/org/hibernate/tool/hbm2x/pojo templates/hbm

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

Author: max...@jb...
Date: 2006-07-24 11:09:49 -0400 (Mon, 24 Jul 2006)
New Revision: 10141

Modified:
   trunk/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/pojo/ComponentPOJOClass.java
   trunk/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/pojo/EntityPOJOClass.java
   trunk/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/pojo/POJOClass.java
   trunk/HibernateExt/tools/src/templates/hbm/persistentclass.hbm.ftl
Log:
HBX-708 hbm2hbmxml misorders version,property from annotations

Modified: trunk/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/pojo/ComponentPOJOClass.java
===================================================================
--- trunk/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/pojo/ComponentPOJOClass.java	2006-07-24 13:20:15 UTC (rev 10140)
+++ trunk/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/pojo/ComponentPOJOClass.java	2006-07-24 15:09:49 UTC (rev 10141)
@@ -160,5 +160,8 @@
 		return null;
 	}
 
-
+   public boolean hasVersionProperty() {
+	   return false;
+   }
+	
 }

Modified: trunk/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/pojo/EntityPOJOClass.java
===================================================================
--- trunk/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/pojo/EntityPOJOClass.java	2006-07-24 13:20:15 UTC (rev 10140)
+++ trunk/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/pojo/EntityPOJOClass.java	2006-07-24 15:09:49 UTC (rev 10141)
@@ -18,6 +18,7 @@
 import org.hibernate.mapping.KeyValue;
 import org.hibernate.mapping.PersistentClass;
 import org.hibernate.mapping.Property;
+import org.hibernate.mapping.RootClass;
 import org.hibernate.mapping.Selectable;
 import org.hibernate.mapping.SimpleValue;
 import org.hibernate.mapping.Subclass;
@@ -779,4 +780,7 @@
 		return getClass().getName() + "(" + (clazz==null?"<none>":clazz.getEntityName()) + ")";
 	}
 	
+	public boolean hasVersionProperty() {
+		return clazz.isVersioned() && clazz instanceof RootClass;
+	}
 }

Modified: trunk/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/pojo/POJOClass.java
===================================================================
--- trunk/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/pojo/POJOClass.java	2006-07-24 13:20:15 UTC (rev 10140)
+++ trunk/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/pojo/POJOClass.java	2006-07-24 15:09:49 UTC (rev 10141)
@@ -105,4 +105,6 @@
 	
 	public Property getIdentifierProperty();
 	
+	public boolean hasVersionProperty();
+		
 }

Modified: trunk/HibernateExt/tools/src/templates/hbm/persistentclass.hbm.ftl
===================================================================
--- trunk/HibernateExt/tools/src/templates/hbm/persistentclass.hbm.ftl	2006-07-24 13:20:15 UTC (rev 10140)
+++ trunk/HibernateExt/tools/src/templates/hbm/persistentclass.hbm.ftl	2006-07-24 15:09:49 UTC (rev 10141)
@@ -69,8 +69,16 @@
 <#include "id.hbm.ftl"/>
 </#if>
 
+<#-- version has to be done explicitly since Annotation's does not list version first -->
+<#if pojo.hasVersionProperty()>
+<#assign property=clazz.getVersion()/>
+<#include "version.hbm.ftl"/>
+</#if>
+
 <#foreach property in clazz.getUnjoinedPropertyIterator()>
+<#if c2h.getTag(property)!="version">
 <#include "${c2h.getTag(property)}.hbm.ftl"/>
+</#if>
 </#foreach>
 
 </${c2h.getTag(clazz)}>
\ No newline at end of file