[Hibernate-commits] Hibernate Code SVN: r9734 - in trunk/HibernateExt/tools/src: java/org/hibernate java/org/hibernate/cfg/reveng test/org/hibernate/tool/test/jdbc2cfg

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

Author: max...@jb...
Date: 2006-04-04 20:33:20 -0400 (Tue, 04 Apr 2006)
New Revision: 9734

Modified:
   trunk/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/OverrideBinder.java
   trunk/HibernateExt/tools/src/java/org/hibernate/hibernate-reverse-engineering-3.0.dtd
   trunk/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/overridetest.reveng.xml
Log:
id-class replacing composite-id-class

Modified: trunk/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/OverrideBinder.java
===================================================================
--- trunk/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/OverrideBinder.java	2006-04-04 21:07:07 UTC (rev 9733)
+++ trunk/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/OverrideBinder.java	2006-04-05 00:33:20 UTC (rev 9734)
@@ -92,7 +92,7 @@
 		if(identifier==null) return;
 		
 		String propertyName = identifier.attributeValue("property");
-		String compositeIdName = identifier.attributeValue("composite-id-class");
+		String compositeIdName = identifier.attributeValue("id-class");
 		
 		Element element = identifier.element("generator");
 		if(element!=null) {

Modified: trunk/HibernateExt/tools/src/java/org/hibernate/hibernate-reverse-engineering-3.0.dtd
===================================================================
--- trunk/HibernateExt/tools/src/java/org/hibernate/hibernate-reverse-engineering-3.0.dtd	2006-04-04 21:07:07 UTC (rev 9733)
+++ trunk/HibernateExt/tools/src/java/org/hibernate/hibernate-reverse-engineering-3.0.dtd	2006-04-05 00:33:20 UTC (rev 9734)
@@ -75,8 +75,8 @@
 <!ELEMENT primary-key (generator?, key-column*) >
 <!-- Property name to use for this primary key -->
 <!ATTLIST primary-key property        CDATA        #IMPLIED >
-<!-- Class to use if primary-key is a composite -->
-<!ATTLIST primary-key composite-id-class CDATA        #IMPLIED >
+<!-- Class to use for representing the id -->
+<!ATTLIST primary-key id-class CDATA        #IMPLIED >
 
 <!ELEMENT generator (param*)>
 <!ATTLIST generator class CDATA #REQUIRED>

Modified: trunk/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/overridetest.reveng.xml
===================================================================
--- trunk/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/overridetest.reveng.xml	2006-04-04 21:07:07 UTC (rev 9733)
+++ trunk/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/overridetest.reveng.xml	2006-04-05 00:33:20 UTC (rev 9734)
@@ -45,7 +45,7 @@
 		alter table Customer add constraint 'max' foreign key (addressid, x) references address (dfdf)
 	-->
 	<table name="ORDERS">
-		<primary-key property="customOrderId" composite-id-class="CustomOID">
+		<primary-key property="customOrderId" id-class="CustomOID">
 <!-- 			<column name="CUSTID" foreign-table="CUSTOMER" foreign-column="CUSTID" />			-->
             <key-column name="ORDERID"/>
  			<key-column name="CUSTID"/>