salto-db-devs Mailing List for Salto Persistence Mechanism (Page 6)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 230
          http://svn.sourceforge.net/salto-db/?rev=230&view=rev
Author:   rflament
Date:     2007-01-31 08:27:28 -0800 (Wed, 31 Jan 2007)

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


Modified Paths:
--------------
    salto-db-generator/trunk/src/com/salto/db/ant/DOGeneratorTask.java
    salto-db-generator/trunk/src/com/salto/db/generator/plugin/EJB3Plugin.java
    salto-db-generator/trunk/src/salto/tool/jdo/util/DoNameCreator.java
    salto-db-generator/trunk/templates/ejb3/dataobject.vm
    salto-db-generator/trunk/templates/hibernateejb3dao/abstracthibernatedao.vm
    salto-db-generator/trunk/templates/hibernateejb3dao/hibernatedao.vm
    salto-db-generator/trunk/templates/hibernateejb3dao/test.vm

Modified: salto-db-generator/trunk/src/com/salto/db/ant/DOGeneratorTask.java
===================================================================

--- salto-db-generator/trunk/src/com/salto/db/ant/DOGeneratorTask.java	2007-01-31 15:38:14 UTC (rev 229)
+++ salto-db-generator/trunk/src/com/salto/db/ant/DOGeneratorTask.java	2007-01-31 16:27:28 UTC (rev 230)
@@ -135,7 +135,6 @@
 						if (colInfos != null) {
 							tableInfos[j].setColInfos(colInfos);
 							JdoInfo jdoInfo = new JdoInfo(tableInfos[j]);
-
 							JdoColInfo[] infos = new JdoColInfo[colInfos.length];
 							for (int i = 0; i < colInfos.length; i++) {
 								infos[i] = new JdoColInfo(colInfos[i]);
@@ -152,7 +151,7 @@
 					} catch (Exception e) {
 						log("Skipping " + tableInfos[j].getTableType() + " '"
 								+ tableInfos[j].getTableName()
-								+ "' because it throws an error ");
+								+ "' because it throws an error " + e);
 					}
 				}
 			}

Modified: salto-db-generator/trunk/src/com/salto/db/generator/plugin/EJB3Plugin.java
===================================================================
--- salto-db-generator/trunk/src/com/salto/db/generator/plugin/EJB3Plugin.java	2007-01-31 15:38:14 UTC (rev 229)
+++ salto-db-generator/trunk/src/com/salto/db/generator/plugin/EJB3Plugin.java	2007-01-31 16:27:28 UTC (rev 230)
@@ -50,6 +50,7 @@
 		context.put("annotations", String.valueOf(generateAnnotations));
 		info.setJavaPckName(pckName);
 		info.setJavaClassName(className);
+
 		runVelocity(TEMPLATE_PATH, "dataobject.vm", srcPath + "/"
 				+ pckName.replace('.', '/') + "/", className + ".java", context);
 

Modified: salto-db-generator/trunk/src/salto/tool/jdo/util/DoNameCreator.java
===================================================================
--- salto-db-generator/trunk/src/salto/tool/jdo/util/DoNameCreator.java	2007-01-31 15:38:14 UTC (rev 229)
+++ salto-db-generator/trunk/src/salto/tool/jdo/util/DoNameCreator.java	2007-01-31 16:27:28 UTC (rev 230)
@@ -76,7 +76,7 @@
 			char[] javaName = new char[len];
 			for (int i = (len - 1); i >= 0; i--) {
 				c = sqlName.charAt(i);
-				if (c == '_') {
+				if (c == '_' && i + 1 + offset < len) {
 					javaName[i + 1 + offset] = Character.toUpperCase(javaName[i
 							+ 1 + offset]);
 					offset++;

Modified: salto-db-generator/trunk/templates/ejb3/dataobject.vm
===================================================================
--- salto-db-generator/trunk/templates/ejb3/dataobject.vm	2007-01-31 15:38:14 UTC (rev 229)
+++ salto-db-generator/trunk/templates/ejb3/dataobject.vm	2007-01-31 16:27:28 UTC (rev 230)
@@ -26,7 +26,9 @@
 #else
  * <p>Pojo mapping table ${jdoInfo.tableName}</p>
 #end
- * ${jdoInfo.getTableRemarks()}
+#if ($jdoInfo.getTableRemarks())
+ * <p>${jdoInfo.getTableRemarks()}</p>
+#end
  *
  * <p>Generated at $date</p>
  * @author ${generatorVersion}
@@ -57,11 +59,15 @@
 
 #if ($util.getLength($jdoInfo.getPk()) > 1)
 	/**
- 	* Composite primary key for table ${jdoInfo.tableName}
- 	*
- 	* Generated at $date
- 	* @author salto-db-generator ${generatorVersion}
- 	*/
+	#if ($jdoInfo.tableShem)
+	  * <p>Composite primary key for table ${jdoInfo.tableShem}.${jdoInfo.tableName}</p>
+#else
+	  * <p>Composite primary key for table ${jdoInfo.tableName}</p>
+#end
+ 	  *
+ 	  * <p>Generated at $date</p>
+ 	  * @author ${generatorVersion}
+ 	  */
 #if ($annotations=="true")
 	@SuppressWarnings("serial")
 	@Embeddable

Modified: salto-db-generator/trunk/templates/hibernateejb3dao/abstracthibernatedao.vm
===================================================================
--- salto-db-generator/trunk/templates/hibernateejb3dao/abstracthibernatedao.vm	2007-01-31 15:38:14 UTC (rev 229)
+++ salto-db-generator/trunk/templates/hibernateejb3dao/abstracthibernatedao.vm	2007-01-31 16:27:28 UTC (rev 230)
@@ -15,31 +15,39 @@
  */
 public abstract class AbstractHibernateDAO<T, ID extends Serializable> implements GenericDAO<T, ID> {
 
-	protected Session session;
+	private Session session;
 
 	public AbstractHibernateDAO(Session s) {
 		session = s;
 	}
+	
+		public Session getSession() {
+		return session;
+	}
 
+	public void setSession(Session session) {
+		this.session = session;
+	}
+
 	public void save(T entity) {
-		session.save(entity);
+getSession().save(entity);
 	}
 
 	public void update(T entity) {
-		session.update(entity);
+		getSession().update(entity);
 	}
 
 	public void saveOrUpdate(T entity) {
-		session.saveOrUpdate(entity);
+		getSession().saveOrUpdate(entity);
 	}
 
 	public void delete(T entity) {
-		session.delete(entity);
+getSession().delete(entity);
 	}
 
 	public void delete(T entity, Boolean doItNow) {
 		if (doItNow) {
-			session.setFlushMode(FlushMode.ALWAYS);
+getSession().setFlushMode(FlushMode.ALWAYS);
 		}
 		delete(entity);
 	}
@@ -48,7 +56,7 @@
 	 * This method will execute an HQL query and return the number of affected entities.
 	 */
 	protected int executeQuery(String query, String namedParams[],	Object params[]) {
-		Query q = session.createQuery(query);
+		Query q = getSession().createQuery(query);
 		
 		if (namedParams != null) {
 			for (int i = 0; i < namedParams.length; i++) {
@@ -67,7 +75,7 @@
 	 * This method will execute a Named HQL query and return the number of affected entities.
 	 */
 	protected int executeNamedQuery(String namedQuery, String namedParams[],	Object params[]) {
-		Query q = session.getNamedQuery(namedQuery);
+		Query q = getSession().getNamedQuery(namedQuery);
 		
 		if (namedParams != null) {
 			for (int i = 0; i < namedParams.length; i++) {

Modified: salto-db-generator/trunk/templates/hibernateejb3dao/hibernatedao.vm
===================================================================
--- salto-db-generator/trunk/templates/hibernateejb3dao/hibernatedao.vm	2007-01-31 15:38:14 UTC (rev 229)
+++ salto-db-generator/trunk/templates/hibernateejb3dao/hibernatedao.vm	2007-01-31 16:27:28 UTC (rev 230)
@@ -42,12 +42,12 @@
 	}
 
 	public ${jdoInfo.javaClassName} getById($pk id) {
-		return (${jdoInfo.javaClassName}) session.get(${jdoInfo.javaClassName}.class, id);
+		return (${jdoInfo.javaClassName}) getSession().get(${jdoInfo.javaClassName}.class, id);
 	}
 
 	public ${jdoInfo.javaClassName} getById($pk id, boolean lock) {
 		if (lock) {
-			return (${jdoInfo.javaClassName}) session.get(${jdoInfo.javaClassName}.class, id,
+			return (${jdoInfo.javaClassName}) getSession().get(${jdoInfo.javaClassName}.class, id,
 					LockMode.UPGRADE);
 		} else
 			return getById(id);
@@ -62,7 +62,7 @@
 	@SuppressWarnings("unchecked")
 	public List<${jdoInfo.javaClassName}> findByCriteria(#foreach($col in ${jdoInfo.jdoColInfos})#set ($ispk="false")#foreach($colpk in ${jdoInfo.getPk()})#if ($colpk.col.equals($col.colName))#set ($ispk="true")#end#end#if ($ispk=="false")#if ($isfirst=="false"), #end$col.getNonPrimitifClass() ${col.javaAttName}#set ($isfirst="false")#end#end) {
 		
-		Criteria criteria = session.createCriteria(${jdoInfo.javaClassName}.class);
+		Criteria criteria = getSession().createCriteria(${jdoInfo.javaClassName}.class);
 
 #foreach($col in ${jdoInfo.jdoColInfos})
 #set ($ispk="false")
@@ -87,20 +87,20 @@
 	@SuppressWarnings("unchecked")
 	public List<${jdoInfo.javaClassName}> findByCriteria(Map criterias) {
 	
-		Criteria criteria = session.createCriteria(${jdoInfo.javaClassName}.class);
+		Criteria criteria = getSession().createCriteria(${jdoInfo.javaClassName}.class);
 		criteria.add(Restrictions.allEq(criterias));
 		return criteria.list();
 	}
 	
 	public int deleteById($pk id) 	{
-		Query q = session.createQuery("delete from ${jdoInfo.javaClassName} where id = :id");
+		Query q = getSession().createQuery("delete from ${jdoInfo.javaClassName} where id = :id");
 		q.setParameter("id",id);
 		return q.executeUpdate();
 	}
 
 	@SuppressWarnings("unchecked")
 	public List<${jdoInfo.javaClassName}> findAll() {
-		Query q = session.createQuery("from ${jdoInfo.javaClassName}");
+		Query q = getSession().createQuery("from ${jdoInfo.javaClassName}");
 		q.setCacheable(true);
 		return q.list();
 	}
@@ -123,7 +123,7 @@
 	 */
 	@SuppressWarnings("unchecked")
 	public List<${jdoInfo.javaClassName}> findBy$util.doNameCreator.attribute2class($col.javaAttName)($col.getNonPrimitifClass() ${col.javaAttName}) {
-		Query q = session.createQuery("from ${jdoInfo.javaClassName} where $util.doNameCreator.class2attribute($util.doNameCreator.createDoName(${colfk2.getPkTableName()})).${col.javaAttName} = :${col.javaAttName}"); //1
+		Query q = getSession().createQuery("from ${jdoInfo.javaClassName} where $util.doNameCreator.class2attribute($util.doNameCreator.createDoName(${colfk2.getPkTableName()})).${col.javaAttName} = :${col.javaAttName}"); //1
 		q.setParameter("${col.javaAttName}",${col.javaAttName});
 		q.setCacheable(true);
 		return q.list();
@@ -138,7 +138,7 @@
 	 */
 	@SuppressWarnings("unchecked")
 	public List<${jdoInfo.javaClassName}> findBy$util.doNameCreator.attribute2class($col.javaAttName)($col.getNonPrimitifClass() ${col.javaAttName}) {
-		Query q = session.createQuery("from ${jdoInfo.javaClassName} where ${col.javaAttName} = :${col.javaAttName}");
+		Query q = getSession().createQuery("from ${jdoInfo.javaClassName} where ${col.javaAttName} = :${col.javaAttName}");
 		q.setParameter("${col.javaAttName}",${col.javaAttName});
 		q.setCacheable(true);
 		return q.list();
@@ -151,7 +151,7 @@
 	 */
 	@SuppressWarnings("unchecked")
 	public List<${jdoInfo.javaClassName}> findBy$util.doNameCreator.attribute2class($col.javaAttName)($col.getNonPrimitifClass() ${col.javaAttName}) {
-		Query q = session.createQuery("from ${jdoInfo.javaClassName} where id.${col.javaAttName} = :${col.javaAttName}");
+		Query q = getSession().createQuery("from ${jdoInfo.javaClassName} where id.${col.javaAttName} = :${col.javaAttName}");
 		q.setParameter("${col.javaAttName}",${col.javaAttName});
 		q.setCacheable(true);
 		return q.list();
@@ -177,7 +177,7 @@
 	 */
 	@SuppressWarnings("unchecked")
 	public List<${jdoInfo.javaClassName}> findBy$util.doNameCreator.attribute2class($col.javaAttName)($col.getNonPrimitifClass() ${col.javaAttName}) {
-		Query q = session.createQuery("from ${jdoInfo.javaClassName} where $util.doNameCreator.class2attribute($util.doNameCreator.createDoName(${colfk2.getPkTableName()})).${col.javaAttName} = :${col.javaAttName}");
+		Query q = getSession().createQuery("from ${jdoInfo.javaClassName} where $util.doNameCreator.class2attribute($util.doNameCreator.createDoName(${colfk2.getPkTableName()})).${col.javaAttName} = :${col.javaAttName}");
 		q.setParameter("${col.javaAttName}",${col.javaAttName});
 		q.setCacheable(true);
 		return q.list();
@@ -192,7 +192,7 @@
 	 */
 	@SuppressWarnings("unchecked")
 	public List<${jdoInfo.javaClassName}> findBy$util.doNameCreator.attribute2class($col.javaAttName)($col.getNonPrimitifClass() ${col.javaAttName}) {
-		Query q = session.createQuery("from ${jdoInfo.javaClassName} where ${col.javaAttName} = :${col.javaAttName}");
+		Query q = getSession().createQuery("from ${jdoInfo.javaClassName} where ${col.javaAttName} = :${col.javaAttName}");
 		q.setParameter("${col.javaAttName}",${col.javaAttName});
 		q.setCacheable(true);
 		return q.list();

Modified: salto-db-generator/trunk/templates/hibernateejb3dao/test.vm
===================================================================
--- salto-db-generator/trunk/templates/hibernateejb3dao/test.vm	2007-01-31 15:38:14 UTC (rev 229)
+++ salto-db-generator/trunk/templates/hibernateejb3dao/test.vm	2007-01-31 16:27:28 UTC (rev 230)
@@ -104,7 +104,7 @@
         existingId = null;
 #end
         dao = null;
-        test${jdoInfo.javaClassName} = null;
+        testEntity${jdoInfo.javaClassName} = null;
     }
 
 	public void set${jdoInfo.javaClassName}DAO(${jdoInfo.javaClassName}DAO dao) {


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




2006	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep (11)	Oct (10)	Nov (3)	Dec
2007	Jan (44)	Feb (30)	Mar (11)	Apr (43)	May	Jun	Jul	Aug (1)	Sep (9)	Oct	Nov (1)	Dec (1)
2008	Jan (1)	Feb	Mar	Apr (17)	May (9)	Jun	Jul	Aug	Sep (1)	Oct	Nov	Dec

salto-db-devs Mailing List for Salto Persistence Mechanism (Page 6)

salto-db-devs — svn commits and jira events