[Salto-db-devs] SF.net SVN: salto-db: [194] salto-db-generator/trunk/templates

[<rfl...@us...>]

Revision: 194
          http://svn.sourceforge.net/salto-db/?rev=194&view=rev
Author:   rflament
Date:     2006-10-13 10:34:02 -0700 (Fri, 13 Oct 2006)

Log Message:
-----------


Modified Paths:
--------------
    salto-db-generator/trunk/templates/ejb3/dataobject.vm
    salto-db-generator/trunk/templates/ejb3/hibernate.cfg.xml.vm
    salto-db-generator/trunk/templates/hibernate/mapping.hbm.vm
    salto-db-generator/trunk/templates/hibernateejb3dao/abstracthibernatedao.vm
    salto-db-generator/trunk/templates/hibernateejb3dao/dao.vm
    salto-db-generator/trunk/templates/hibernateejb3dao/daofactory.vm
    salto-db-generator/trunk/templates/hibernateejb3dao/genericdao.vm
    salto-db-generator/trunk/templates/hibernateejb3dao/hibernatedao.vm
    salto-db-generator/trunk/templates/hibernateejb3dao/hibernatedaofactory.vm
    salto-db-generator/trunk/templates/hibernateejb3dao/hibernateutil.vm

Modified: salto-db-generator/trunk/templates/ejb3/dataobject.vm
===================================================================
--- salto-db-generator/trunk/templates/ejb3/dataobject.vm	2006-10-09 17:58:46 UTC (rev 193)
+++ salto-db-generator/trunk/templates/ejb3/dataobject.vm	2006-10-13 17:34:02 UTC (rev 194)
@@ -29,7 +29,7 @@
  * ${jdoInfo.getTableRemarks()}
  *
  * Generated at $date
- * @author salto-db-generator ${generatorVersion}
+ * @author ${generatorVersion}
  * 
  */
 #if ($annotations=="true")

Modified: salto-db-generator/trunk/templates/ejb3/hibernate.cfg.xml.vm
===================================================================
--- salto-db-generator/trunk/templates/ejb3/hibernate.cfg.xml.vm	2006-10-09 17:58:46 UTC (rev 193)
+++ salto-db-generator/trunk/templates/ejb3/hibernate.cfg.xml.vm	2006-10-13 17:34:02 UTC (rev 194)
@@ -32,7 +32,7 @@
 #end
 #else
 #foreach($jdoInfo in ${jdoInfos})		
-		<mapping file="${jdoInfo.javaClassName}.hbm.xml" />
+		<mapping resource="${jdoInfo.javaClassName}.hbm.xml" />
 #end
 #end
 

Modified: salto-db-generator/trunk/templates/hibernate/mapping.hbm.vm
===================================================================
--- salto-db-generator/trunk/templates/hibernate/mapping.hbm.vm	2006-10-09 17:58:46 UTC (rev 193)
+++ salto-db-generator/trunk/templates/hibernate/mapping.hbm.vm	2006-10-13 17:34:02 UTC (rev 194)
@@ -1,10 +1,10 @@
-<!DOCTYPE hibernate-configuration PUBLIC
-    "-//Hibernate/Hibernate Configuration DTD 3.0//EN"
-    "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+<!DOCTYPE hibernate-mapping PUBLIC
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> 
 
 <!-- This file has been generated by ${generatorVersion} at $date -->
-<hibernate-mapping package="${jdoInfo.javaPckName}">
-	<class name="${jdoInfo.javaClassName}" table="${jdoInfo.tableName}">
+<hibernate-mapping>
+	<class name="${jdoInfo.javaPckName}.${jdoInfo.javaClassName}" table="${jdoInfo.tableName}">
 
 #set( $sprimarykeydone = "false" )
 #foreach($col in ${jdoInfo.jdoColInfos})
@@ -37,7 +37,7 @@
 #foreach($colpk in ${jdoInfo.getPk()})
 #if ($colpk.col.equals($col.colName))
 #if ($sprimarykeydone=="false")
-		<composite-id name="id" class="${jdoInfo.javaClassName}\$${jdoInfo.javaClassName}PK">
+		<composite-id name="${util.DoNameCreator.class2attribute($jdoInfo.javaClassName)}PK" class="${jdoInfo.javaPckName}.${jdoInfo.javaClassName}\$${jdoInfo.javaClassName}PK">
 #foreach($col in ${jdoInfo.jdoColInfos})
 #foreach($colpk in ${jdoInfo.getPk()})
 #if ($colpk.col.equals($col.colName))
@@ -77,24 +77,24 @@
 #if ($util.getLength($colfk) > 1)
 #foreach($colfk2 in $colfk)
 #if ($fkdone=="false")
-	 	<set name="${util.DoNameCreator.class2attribute($util.DoNameCreator.createDoName($colfk2.getFkTableName()))}s" inverse="true">
+	 	<bag name="${util.DoNameCreator.class2attribute($util.DoNameCreator.createDoName($colfk2.getFkTableName()))}s" inverse="true">
 			<key>
 #foreach($colfk3 in $colfk)
 	 			<column name="$colfk3.getFkColumnName()"/>
 #end
 			</key>
-			<one-to-many class="$util.DoNameCreator.createDoName($colfk2.getFkTableName())"/>
-		</set>
+			<one-to-many class="${jdoInfo.javaPckName}.$util.DoNameCreator.createDoName($colfk2.getFkTableName())"/>
+		</bag>
 		
 #set ($fkdone="true")
 #end
 #end
 #else
 #foreach($colfk2 in $colfk)
-		<set name="${util.DoNameCreator.class2attribute($util.DoNameCreator.createDoName($colfk2.getFkTableName()))}s" inverse="true">
+		<bag name="${util.DoNameCreator.class2attribute($util.DoNameCreator.createDoName($colfk2.getFkTableName()))}s" inverse="true">
 			<key column="$colfk2.getFkColumnName()"/>
-			<one-to-many class="$util.DoNameCreator.createDoName($colfk2.getFkTableName())"/>
-		</set>
+			<one-to-many class="${jdoInfo.javaPckName}.$util.DoNameCreator.createDoName($colfk2.getFkTableName())"/>
+		</bag>
 
 #end
 #end

Modified: salto-db-generator/trunk/templates/hibernateejb3dao/abstracthibernatedao.vm
===================================================================
--- salto-db-generator/trunk/templates/hibernateejb3dao/abstracthibernatedao.vm	2006-10-09 17:58:46 UTC (rev 193)
+++ salto-db-generator/trunk/templates/hibernateejb3dao/abstracthibernatedao.vm	2006-10-13 17:34:02 UTC (rev 194)
@@ -10,7 +10,7 @@
 /**
  * Generated at $date
  *
- * @author salto-db-generator ${generatorVersion}
+ * @author ${generatorVersion}
  */
 public abstract class AbstractHibernateDAO<T, ID extends Serializable> implements GenericDAO<T, ID> {
 

Modified: salto-db-generator/trunk/templates/hibernateejb3dao/dao.vm
===================================================================
--- salto-db-generator/trunk/templates/hibernateejb3dao/dao.vm	2006-10-09 17:58:46 UTC (rev 193)
+++ salto-db-generator/trunk/templates/hibernateejb3dao/dao.vm	2006-10-13 17:34:02 UTC (rev 194)
@@ -21,7 +21,7 @@
 /**
  * Generated at $date
  *
- * @author salto-db-generator ${generatorVersion}
+ * @author ${generatorVersion}
  */
 public interface ${jdoInfo.javaClassName}DAO extends GenericDAO<${jdoInfo.javaClassName},$pk> {
 

Modified: salto-db-generator/trunk/templates/hibernateejb3dao/daofactory.vm
===================================================================
--- salto-db-generator/trunk/templates/hibernateejb3dao/daofactory.vm	2006-10-09 17:58:46 UTC (rev 193)
+++ salto-db-generator/trunk/templates/hibernateejb3dao/daofactory.vm	2006-10-13 17:34:02 UTC (rev 194)
@@ -6,7 +6,7 @@
  * Generated at $date
  *
  * @see http://www.hibernate.org/328.html
- * @author salto-db-generator ${generatorVersion}
+ * @author ${generatorVersion}
  */
 
 public abstract class DAOFactory {

Modified: salto-db-generator/trunk/templates/hibernateejb3dao/genericdao.vm
===================================================================
--- salto-db-generator/trunk/templates/hibernateejb3dao/genericdao.vm	2006-10-09 17:58:46 UTC (rev 193)
+++ salto-db-generator/trunk/templates/hibernateejb3dao/genericdao.vm	2006-10-13 17:34:02 UTC (rev 194)
@@ -6,7 +6,7 @@
 /**
  * Generated at $date
  *
- * @author salto-db-generator ${generatorVersion}
+ * @author ${generatorVersion}
  */
 public interface GenericDAO<T, ID extends Serializable> {
 

Modified: salto-db-generator/trunk/templates/hibernateejb3dao/hibernatedao.vm
===================================================================
--- salto-db-generator/trunk/templates/hibernateejb3dao/hibernatedao.vm	2006-10-09 17:58:46 UTC (rev 193)
+++ salto-db-generator/trunk/templates/hibernateejb3dao/hibernatedao.vm	2006-10-13 17:34:02 UTC (rev 194)
@@ -27,7 +27,7 @@
 /**
  * Generated at $date
  *
- * @author salto-db-generator ${generatorVersion}
+ * @author ${generatorVersion}
  */
 public class ${jdoInfo.javaClassName}HibernateDAO extends
 		AbstractHibernateDAO<${jdoInfo.javaClassName}, $pk> implements

Modified: salto-db-generator/trunk/templates/hibernateejb3dao/hibernatedaofactory.vm
===================================================================
--- salto-db-generator/trunk/templates/hibernateejb3dao/hibernatedaofactory.vm	2006-10-09 17:58:46 UTC (rev 193)
+++ salto-db-generator/trunk/templates/hibernateejb3dao/hibernatedaofactory.vm	2006-10-13 17:34:02 UTC (rev 194)
@@ -9,7 +9,7 @@
  * Generated at $date
  *
  * @see http://www.hibernate.org/43.html
- * @author salto-db-generator ${generatorVersion}
+ * @author ${generatorVersion}
  */
 public class HibernateDAOFactory extends DAOFactory {
 

Modified: salto-db-generator/trunk/templates/hibernateejb3dao/hibernateutil.vm
===================================================================
--- salto-db-generator/trunk/templates/hibernateejb3dao/hibernateutil.vm	2006-10-09 17:58:46 UTC (rev 193)
+++ salto-db-generator/trunk/templates/hibernateejb3dao/hibernateutil.vm	2006-10-13 17:34:02 UTC (rev 194)
@@ -3,12 +3,16 @@
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.Transaction;
+#if ($annotations=="true")
 import org.hibernate.cfg.AnnotationConfiguration;
+#else
+import org.hibernate.cfg.Configuration;
+#end
 
 /**
  * Generated at $date
  *
- * @author salto-db-generator ${generatorVersion}
+ * @author ${generatorVersion}
  */
 public final class HibernateUtil {
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.